Merge stage-aosp-master to aosp-master - DO NOT MERGE

Change-Id: I10b67739626e0fefbf2643458dfdb36ed3a9e255