Merge "Use ProtoOutputStream to strip Pii sensetive fields in incidentd"