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

Change-Id: I46dd8facbac82da0651a5fb9e8c5c22e168d29c6