Merge "Merge stage-aosp-master into master."
am: 9aba58bff7

Change-Id: Iec13159cb09e5cafe1019231e4351692c3a19f41