Merge "Snap for 10929834 from 5eae8ebb3c5756e41e77a1f7201fcf94b0eade1f to sdk-release" into sdk-release