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

Change-Id: I1b54ecc574169c0701d52840328eeffb266d6051