Merge "ContextHub: Avoid reference leaks" into cw-f-dev am: efdd4ac34b
am: bdd241126d

Change-Id: Ifc1241043829d9780ef16cc72ebbc3b112ff617c