Merge "Fix wrong import" into nyc-dev
am: 4fec5fe6ef

* commit '4fec5fe6efcf6c3a932b1fe7f2f68264e9d7b604':
  Fix wrong import

Change-Id: I842f605bf28e6fb707410fde4e4b107ad77803ff