Merge "Move ContextHubService to a better location."