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

Change-Id: I2eb887dad807e8f0f77620f3545bda3747a5013c