This a cherry pick from the ASIC's branch. Change-Id: Ic6e888f8fa96103d1e79432dd75e68faabd8cf6c [ROCm/clr commit: ce5cc020af]
ce5cc020af