ORT 1.22.2 cherry-pick PR 25552#25720

adrianlizarraga merged 1 commit intorel-1.22.2microsoft/onnxruntime:rel-1.22.2from

adrianl/rel-1.22.2/cherry-pick-2microsoft/onnxruntime:adrianl/rel-1.22.2/cherry-pick-2Copy head branch name to clipboard