Merge "Snap for 13242496 from 1a8be4f98b3c8f7504cbbb400d486939a6df3a03 to sdk-release" into sdk-release