DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64  -s ours
am: 951b0dccf0

Change-Id: Ib8125c31898b27cfa6607c3cb3ec820c290dfe99