Merge "ContextHub: Avoid reference leaks" into nyc-dev
am: 5ee41098b0

* commit '5ee41098b0d36cce4f6cb690cbaafdffb4177e8f':
  ContextHub: Avoid reference leaks

Change-Id: I7b8c1b5da46cdd1e6c1a294f338c6ace30b52ff6