Merge stage-aosp-master to aosp-master - DO NOT MERGE am: c9138b05cb am: ca02df17b8

Change-Id: I2c08df8ab58bfcbd1ec2a9742c845a86f4540979