Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 201a0667b3

Change-Id: I9e834f1a993e2fa61e52135a5bb7a19de8d1b2a9