Cherry-picks into rel-1.22.0#24624

jywu-msft merged 2 commits intorel-1.22.0microsoft/onnxruntime:rel-1.22.0from

vraspar/cherry_pick_round3microsoft/onnxruntime:vraspar/cherry_pick_round3Copy head branch name to clipboard