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

Change-Id: I9a9449b4653be6b9bedc1ede59ef553e3c9b35e7