DO NOT MERGE: Revert "Fix build" am: a0a908f5d6
am: 0a1a0e6e61  -s ours

Change-Id: I9d4ecca39800413fa9eb483715bf810028d61334