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