[automerger skipped] DO NOT MERGE
am: 26a4ca7747  -s ours

Change-Id: Idebe9fb3911228ba4e6363420b64f28f2b34959a