Merge "Fix typo in ContextHubService.java" into main