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 am: ea729dcae5 am: 369bf9065d
am: 79f474a679  -s ours

Change-Id: I31ef016a5e85f365e0aa297fe37c65d2a391071b