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

Change-Id: Ia1270b19491530ce227252ebe3354d409fb1fb8c