Merge "Fix event listener timeout issues" into oc-dev
am: 61fd056380

Change-Id: I737521de9c183b763f87d5e84da569a197e0a370