Merge "Sync enabled_provider_drivers config help message"