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

Change-Id: Ib1ada85d0902d10786f06e2ba958326f3884324e