Merge "Snap for 11566117 from 0ccefc42de3a55211da84c9f67b5a1fb748db577 to sdk-release" into sdk-release