Merge "Snap for 9979206 from a1a566338b7fdc036758fadaf5957b40cbfa1635 to sdk-release" into sdk-release