Merge "Deprecates classes associated with old ContextHubManager APIs"