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

Change-Id: If0d77fc4311666cff881c371167fd19a534d0fb2