Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 3010e76b9b am: 74ec5ed4ed

Change-Id: I5e71b8bbe535beb878fa41da9d38bfb818c9ceb8