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

Change-Id: I6d234262924b6aa83acacccd1e9783a87235f56e