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

Change-Id: I6047b1af5b0ac1ee29d512392bbfe7fd3d161e06