Merge "DO NOT MERGE: Revert "Fix build"" into nyc-mr1-dev-plus-aosp