DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1.
am: 547c7d9a0b  -s ours

Change-Id: I7161f648e78ece5d8ee8b5c73be49e5a52f01b7b