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

Change-Id: I07b5b396b277573f276cec97ed0f0684e8a72885