Merge "Update ContextHubManager's System APIs." into nyc-dev