Merge "Perfprofd: Change proto naming"