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