Merge stage-aosp-master to aosp-master - DO NOT MERGE am: f8e2fd922c

Change-Id: Iae84acb9580dc8d5a166be45f7b0d55f7b0ee71b