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

* commit '1474915ba325bf1de9655e1669dc62c06a399c7b':
  remove unneeded import