Merge "Revert "Fix build"" into nyc-dev am: 1b5ec362c2
am: d6558efbe0

* commit 'd6558efbe0fbf3c3e85adb1241894590ef3be6c2':
  Revert "Fix build"

Change-Id: Ic152c58ca975eb178150d9bb8662f16ca563fdcb