Merge "Snap for 5735642 from 17b630aa20ca1344725fa9cccc63dfda004a738e to sdk-release" into sdk-release