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

Change-Id: I71b5adde19f90fe3288a3c9ccd64c75a564171e9