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

Change-Id: I46164aa3310bd9e25a06b9c0fe7d60501cf22a61