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