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

Change-Id: I4de4ae8b49d963f51caf5c479e86a79b16daa758