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

* commit 'd775a70cf023fecdaa7c10ebc4c3dfe76ba7492c':
  Revert "Fix build"

Change-Id: I92eff4fd2bb071f9cec3852711041f7ef9c1ca42