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

Change-Id: Ia170335a968f958b746953aa54723ceadece2acd