Merge "Snap for 10929834 from 16467b971bd3e2009fad32dd79016f2c7e421deb to sdk-release" into sdk-release