Merge "Make ContextHubService compliant with new context hub interface." into nyc-mr1-dev