Fix full-eng build breakage due to dbacd826a100f2c. am: 6e39c88b1e am: cb3d79385d am: 9fd1c2fe65 am: 6f5467da9a
am: a76b9888aa

Change-Id: I09d25914710df08e60254096f5a8806adb06afd1