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

Change-Id: Id1ceb16b426d7e378765cb9f55daa0796b6fc5bb