Merge "ContextHubService: Remove unused using declaration"