DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65 am: 2a21f09fff  -s ours am: 83cf293b73  -s ours am: 45cd2f896b am: 52f7319fc0 am: ab5c805aec  -s ours am: 1dd4973234 am: 484d229a3c am: 2c4162e822 am: ab3d5af8d2  -s ours am: 7e822583ee am: 554ad9b1fa
am: f517b3013e

Change-Id: Id3ca9b27a6c4d160ddce9f258bb900b18cad6457