[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: cd3459f07b am: f581c5cbad -s ours am: d2d9f9e087

Change-Id: I4f2f14306dbb1e72968b9bd866708be0ecabd56a