[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 5eb772bfa5 am: cf2ac5d958 -s ours am: 857509b840

Change-Id: I8afd1a4710a8f137247ee2a20988a988d9108dc4