Merge "Snap for 5798008 from cbd1af9db07e0ec364f543b4267c630902fd8ef9 to sdk-release" into sdk-release