Merge "Add missing case in DefaultOmtpEventHandler" into nyc-mr1-dev am: d523e4474f am: 804a969943
am: 242bdf2fca

Change-Id: I4226bb99e1c22a2ec8b3fd1fac68aacef6a33b04