ICM fixes (1/n) (#27906)
### Description
A couple of ICM fixes
https://portal.microsofticm.com/imp/v5/incidents/details/31000000575230/summary
https://portal.microsofticm.com/imp/v5/incidents/details/31000000575265/summary
### Motivation and Context
ICM fixes
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
