Merge "Merge stage-aosp-master into master."
am: d6d7055c30

Change-Id: I3afc4e5fdd3e7e86445c8f9faa8847e8ce0cd2fb