Merge "Perfprofd: Fix counter tests"