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

Change-Id: I9dd174d52fb821a622993d691b90cf54ef714cfa