DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b  -s ours am: 4732ec6440  -s ours
am: 59c7fe7a39

Change-Id: I9a490f299bcbd250b4266888dab733b0107bf74f