ICM fixes (5/n) (#27971)
### Description
Fixes 3 ICM fixes:
https://portal.microsofticm.com/imp/v5/incidents/details/31000000572208/summary
https://portal.microsofticm.com/imp/v5/incidents/details/31000000573313/summary
https://portal.microsofticm.com/imp/v5/incidents/details/31000000575583/summary
### Motivation and Context
Fix ICM issues
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
