Merge "Add missing case in DefaultOmtpEventHandler" into nyc-mr1-dev