Merge "Avoid including bad service names in perf.json"