ContextHub: Avoid reference leaks
am: 52dda59896

Change-Id: I78df3e5c2f78684eb1ec5ac4f2781cf88b0fa2f2