onnxruntime

Cherry-pick b8f373b0aee086a36ea357bc2ffb2944246be15a (#17895)

#17926

Merged