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

Change-Id: I57cebdb9a67a42ce8f37288768c7778406a6289e