[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 9cbdb82e0d am: f244f93c19 -s ours am: 27079a8bc1

Change-Id: I12decbe83c0833cacbf6ed82eaebfba2a3fa09d5