Merge "Stores ContextHubInfo in ContextHubClientBroker"