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

Change-Id: I7e969a4988bdc01f21f09137cfe2f8e692101a3c