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

Change-Id: I280e2dc5a9ed53219184060931bde6b37914d7df