DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65 am: 2a21f09fff  -s ours
am: 83cf293b73  -s ours

Change-Id: I92bb3e0101da80205105f1d047eea56f5c5d85a0