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

Change-Id: Idef07bf7506eaacfb00119f1359b7efbb53f5a85