Merge "Snap for 5735642 from 9e499222f1d0cd3cff5d85e6f2472318ac75a3d6 to sdk-release" into sdk-release