Merge "Snap for 11541002 from 06d502951fccd0172e1db8729dd04c7473e5c474 to sdk-release" into sdk-release