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

Change-Id: Id9f7ee0e7b221507988651aaf50d8434b052e998