Merge "Snap for 11566117 from 8bce44e08bbc3d3f61161fb7266106d893709971 to sdk-release" into sdk-release