Merge "Revert "Add event parameters to MtpEvent.""