Cherry pick from npi branch. Change-Id: I4e72c5477d7e0ebb454d651d1f84866ce4d27ee5 [ROCm/clr commit: ebd1a4a150]
ebd1a4a150