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

Change-Id: I8884dd090583f0e089830410e6a00c4c49e6b43c