Merge "Snap for 5234541 from 48beb83b59b0062adb88694e875b3e4ac8a48757 to sdk-release" into sdk-release