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

* commit '1b5ec362c20971875f2da3960c8aefc37f4acc09':
  Revert "Fix build"

Change-Id: I3c8cb07599fd22f283844bdd1ccdfb1b60a38462