Merge "Snap for 5735642 from 7965a95adc527dd6c2117833c96fb5382e6b9f11 to sdk-release" into sdk-release