Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 11f9bbf449 am: 03bd36a997

Change-Id: I5856313d97c099c2ce2e3b1c60455e873826df6d