Merge "Snap for 13198286 from 8e4625b9e470218589b3c55614e8d5caec7a0394 to sdk-release" into sdk-release