Merge "fix: ATRACE does not work for libs loaded in sphal namespace" into oc-dev