This reverts commit 3b9963c499. Reason for revert: <Need rocprofiler changes to avoid PSDB failures> Change-Id: I856b7ea30744f1b7bb099b6adbce2155201be539
3b9963c499
Change-Id: If32eb0ee152f3f46741a8277689363181c8753e8
Change-Id: Id1f8db09271c537a200bc090ba1feaacfb023b88
Change-Id: I8f5ad81162581bf3792c2606ba8c6c3a8e0b4bf2