Merge "Include pid in trace metadata"