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

Change-Id: If03176ce2477b45e68eb68d00193ae08b4c420da