Revert "Fix full-eng build breakage due to dbacd826a100f2c." am: d5715c5d2d am: c6b5b67139 am: f9b3f6b9e6 am: 1833088893 am: 6a7e3ac83b am: 983101645f am: 97ea07ded3 am: eed0d07ce1
am: 42bb0c292c

Change-Id: I680ecf734a03e066616cef7b2fa70efba1c253ee