Fix build breakage
am: ccb2f49432

Change-Id: I7acc798fec8d90dfad52f0795575763f8299b1fa