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

Change-Id: I56c801694e58b90a572563936e9b593fa11eda7e