Merging all the changes from internal development gerrit to github [ROCm/rocm-core commit: 9b163aa567]
9b163aa567