Fix full-eng build breakage due to dbacd826a100f2c. am: 6e39c88b1e am: cb3d79385d am: 9fd1c2fe65 am: 6f5467da9a am: a76b9888aa am: 9c44d4865e am: cab99bb027 am: da66154ba3 am: 752ab47b98 am: fe9a7192e1 am: 2d319cda43
am: 23fb71b8b9  -s ours

Change-Id: I0d59ac44f944b973e818a1740d082ef7c565fdb6