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

Change-Id: I9121ff51063bb162c0837ea8b1be948c00a53fb9