Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 4aa3dcb2b9 am: 1762f1b41b

Change-Id: Ic8d1f8d01f404c3c04ac5d10ee59c65fb3c099c6