Merge "Fix reference loop in IEventQueue implementation." into oc-dev
am: e382c18831

Change-Id: Ie1c1a2d6b1820ce1a21d96ba523d904e635522ae