Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 839b56d04b am: c654c40d52

Change-Id: I1ce9c4e8f30cef3a043a118caa9f38569b3cce00