Merge "Snap for 11541002 from 78abc21377def5af27179d903f4899b81cccce12 to sdk-release" into sdk-release