Merge "resourcemanager: map right codec type for metrics" into main