[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: c06ce6632e am: b62cacc43c -s ours am: 04b18e6f14

Change-Id: I6a78e5dc30395852876b97a796c9bdacf991623b