SWDEV-460816 - Merge PR#3475 and PR#3435 to Gerrit staging
Change-Id: Ie94897bac6e1cd44826988117ca6bb20ba2c2614
[ROCm/hip commit: d592b826ba]
This commit is contained in:
Change-Id: Ie94897bac6e1cd44826988117ca6bb20ba2c2614
[ROCm/hip commit: d592b826ba]