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

Change-Id: I29d07b1b6178e55bb4c82a2f12382996f3426d06