Merge "Perfprofd: Fix test expectations"