1678c03e90
part 2 of the fix
Change-Id: I4ff2cf0f82b5cf57c7ee51a60bbac770a605a837
[ROCm/clr commit: 42f8b9183d]