ICM fixes (6/n) (#28255)
### Description
Fixes:
https://portal.microsofticm.com/imp/v5/incidents/details/31000000586963
https://portal.microsofticm.com/imp/v5/incidents/details/31000000586944
### Motivation and Context
Fix ICM issues
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
