Merge "ContextHubService: Pass on query requests" into oc-dev