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

Change-Id: Ic674bdfb568c5579b9b3c6ee1c0a2515b4802872