Merge "Snap for 11819063 from 1d591b26a93fdd71b0e1fd941a74748c241b3258 to sdk-release" into sdk-release