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

Change-Id: Ib875d2d8f81a2ecd84e329a7a005dddccbb88d84