[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 917b666966 am: 2d9c7a23b3 -s ours am: 7e7c57bcb6 am: 4aaeb09583

Change-Id: I75728229b3356c1a62eec8953fd82724b218a879