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

Change-Id: Ia5bd4eab487472b9c84cc90176dff2b1f6689283