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

Change-Id: Ic60afdb3082fe5d24057407dc2810e552bb8c7dd