Merge "ContextHubService: Maintain hub result meaning" into nyc-mr1-dev