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