[automerger skipped] DO NOT MERGE am: 2be91dee92 -s ours Change-Id: I077491113a3248a9a890e85030564ee110bfe4c8