Merge "Snap for 11541002 from b447134207044004bec3e4801e23cb2867b74d02 to sdk-release" into sdk-release