[automerger skipped] DO NOT MERGE Fix build breakage
am: 634fd70147  -s ours

Change-Id: Id90d30142b308e81a0c6ce882c972a36a14e504f