Merge "add event type enum to proto def"