Merge "test_service_providers: require service-type ext"