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

Change-Id: I5239a8efff5090ad7ecfb56c1920d5b5c31842d1