Merge "Snap for 7821744 from 6a61f5e26e66d5a2589d07505b5712d8c6d680c6 to sdk-release" into sdk-release