[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 838538ace5 am: 088e00aabe -s ours am: d42d7876f7

Change-Id: I96e0539d0a38624cdc9cc15c8d12f9449b332f22