Merge "Revert "Remove the IncidentHeaderProto dependency from statsd.""