am 45b0385a: Merge "remove unneeded import" into jb-mr1-dev

* commit '45b0385ac4f192a4a211872dee4a2a5dbd2a56fd':
  remove unneeded import