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

Change-Id: Iaa35c4240a11ccba54f88e47e44696210403d3e6