DO NOT MERGE: Revert "Fix build"
am: a0a908f5d6

Change-Id: I3ba66290b49fbe184eff424f5e70b8f32ed6fb3e