DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b  -s ours am: 4732ec6440  -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0  -s ours am: 886eb4351e
am: 4f22203279

Change-Id: I08886c30fdabfd59f5a75279e70ec74fc26b2d0b