[automerger skipped] Merge "DO NOT MERGE"
am: 8253611aa1  -s ours

Change-Id: I1141d0b895b9b7e6751956cf1632c0a954ade220