[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: a54deb34ff am: d051af7e55 -s ours am: 23fb422e2a

Change-Id: Icf2646c4a1321bb325d2fba5cc4afbb2abc8de3d