Merge "Snap for 10929834 from 31b1011ea5403d3b29e622dbd0f77fc607ed6b06 to sdk-release" into sdk-release