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

Change-Id: Idab06fdf79e3d154c18caffcb2e1083cc37fd25b