Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: d8af24477c

Change-Id: I1c3bd3d2a9e02c9b14dbeee3cac40569b6fccf2e