Merge "ContextHubManager: Fix API documentation." into nyc-mr1-dev