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

Change-Id: I0ad76feb073074ec935ac49de8a2af55d48932bc