Merge "Use shared_ptr for EventEntry"