09cfa97156
* Rebase and address merge conflicts * SWDEV-551218 - Fix hip on nvidia build failures
* Rebase and address merge conflicts * SWDEV-551218 - Fix hip on nvidia build failures