Merge "ContextHub: Avoid reference leaks" into nyc-mr1-dev am: 6bf3424ccf
am: 34230195ab

Change-Id: I15c4909b514e6f996730f35c91a3265cd3004832