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

Change-Id: I2cb8cb379fa17760d4c7a5455c23237a4ed0a5c9