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

Change-Id: Ie8ed5e1b1a19a8c8750237b9d0d61b75c62816ec