Merge "Snap for 5798008 from 39ceab0aea1636255de8f75e8b8c7c91ce41fee7 to sdk-release" into sdk-release