Merge stage-aosp-master to aosp-master - DO NOT MERGE

Change-Id: I1152b9ce98f465b6b8aaa11e106bb6655526dad2