Merge changes I7cd58841,I800bde6f

* changes:
  Implements getContextHubs
  Merges ContextHubService notion of hub ID/handle