Merge "Merge changes Ib1c28c94,Id3485a2a,If5ad5acf,Idc9054bd,Ie4e7e25d am: 756621f54d am: aae80e18c3" into sc-dev-plus-aosp