5834ff51ca
Change-Id: I8f1ac8cc884b57e0a46388303e18fd7ff2861b6c
resolve conflicts
Change-Id: Ie8259826fd71878aa314e7407c741c4c75c13c6e
Fixed format
Change-Id: I9730a59f79ad75f1eb55890b775bac1a46a82a1b
[ROCm/rocprofiler commit: 2478e98644]