Merge \"Make ContextHubService compliant with new context hub interface.\" into nyc-mr1-dev
am: 80d90d1783

Change-Id: Ibdda2e82b6175832474c07121d867ee4761e6d19