Merge "Snap for 8005954 from 6df1e7e2c3eb8ef4499f1279d91ecaae6b3991cd to sdk-release" into sdk-release