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

Change-Id: I1496081f6dab45d8aa452e62f26072ea304cade0