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

Change-Id: I808da09dc5496d2cc3471fa3de6c083c80d038b4