Merge "Snap for 5281935 from 209070aecd4687a2b4c3b08cc6d12b2d73eb7f22 to sdk-release" into sdk-release