Merge "Snap for 10929834 from 02424279a734a0cb64681cf11d5208a917662433 to sdk-release" into sdk-release