[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: cd3459f07b am: f581c5cbad -s ours am: d2d9f9e087 am: b62fa5884b

Change-Id: I6f6810babeddafce33c300c8c80e361d2d4b2ff1