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

Change-Id: Iab33bd4f0a5cb970bab4781544bda67abf54e4d2