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

Change-Id: Ie48434c15155659297f9256df182346a83b0bd98