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

Change-Id: Id0425c97a4d88c9fdce284805b79442e2547e4fd