[automerger skipped] DO NOT MERGE
am: 7b45ebf39d  -s ours

Change-Id: I0b52ffa27ea880a8f03d6d20f7f8d1d4d8db42ca