Merge "Snap for 10929834 from b771f86bcb3d0086ee5eda84da70634e7ab746dd to sdk-release" into sdk-release