Merge "Snap for 7821744 from 0bfa3fc1cd1c7ef3e563aa5506ee16cfb1ed4494 to sdk-release" into sdk-release