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

Change-Id: I69e8b7df2a07be85f2e99a3e77695c7cf7bca9cb