29cce17291
Changes from Jason Tang, Tony Tye
Change-Id: Idb9b6923f12dfb61a5773c9aa3d3fbeb1327ec47
[ROCm/clr commit: ee6b0d9294]