cherry-pick of compute/ec/clr/+/1184122 Co-authored-by: Juan Manuel Martinez Caamaño <juamarti@amd.com> [ROCm/clr commit: f580632174]
f580632174