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

Change-Id: Ib3a5ab06dda22558df4602febc5840a55f887fd9