Snap for 6435660 from a12ac7533b9e1429a42f011d7e1e647e84992bb4 to sdk-release

Change-Id: I422fd491113e8cb8936a8dcb8b38179e87112fa9