Merge "Refactor incident_helper to use protoutil and cppstream plugin."