Merge "Snap for 11541002 from 974aaeb80e6dd5df6717865bbe85376e00921c85 to sdk-release" into sdk-release