Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 94225a00fa am: a588d36972

Change-Id: Ic642819b1fc8e662d1fc855e5de79073999fb810