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

Change-Id: I44ee11cd65c02d60ff8a54d91d159771b428206f