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

Change-Id: Iee5c0addec79e1cdbd929b72cf7084900c00073e