Merge "Snap for 11541002 from 5a9996d3fa744b9e720d1696f01f9d14829a87a5 to sdk-release" into sdk-release