Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 2f1d5e7fbb

Change-Id: I4760f75f4b3a3fa3083a7ec692f8e847e658faca