[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 42ac06e560 am: 52d940cabb -s ours am: 837b059e52 am: a8c15d883d

Change-Id: I965949db6052f9f4c7bd585baf55426dd377b4fc