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

Change-Id: I9c00544fe1be321a828bcd8512a110007170c3d0