@@ -79,10 +79,6 @@
  * name, and additionally a parseName method to extract the individual identifiers
  * contained within formatted names that are returned by the API.
  *
- * This class is currently experimental and may be subject to changes.
- *
- * @experimental
- *
  * @method PromiseInterface createDeploymentAsync(CreateDeploymentRequest $request, array $optionalArgs = [])
  * @method PromiseInterface deleteDeploymentAsync(DeleteDeploymentRequest $request, array $optionalArgs = [])
  * @method PromiseInterface deleteStatefileAsync(DeleteStatefileRequest $request, array $optionalArgs = [])
@@ -113,19 +109,24 @@ final class ConfigClient
     /** The name of the service. */
     private const SERVICE_NAME = 'google.cloud.config.v1.Config';
 
-    /** The default address of the service. */
+    /**
+     * The default address of the service.
+     *
+     * @deprecated SERVICE_ADDRESS_TEMPLATE should be used instead.
+     */
     private const SERVICE_ADDRESS = 'config.googleapis.com';
 
+    /** The address template of the service. */
+    private const SERVICE_ADDRESS_TEMPLATE = 'config.UNIVERSE_DOMAIN';
+
     /** The default port of the service. */
     private const DEFAULT_SERVICE_PORT = 443;
 
     /** The name of the code generator, to be included in the agent header. */
     private const CODEGEN_NAME = 'gapic';
 
     /** The default scopes required by the service. */
-    public static $serviceScopes = [
-        'https://www.googleapis.com/auth/cloud-platform',
-    ];
+    public static $serviceScopes = ['https://www.googleapis.com/auth/cloud-platform'];
 
     private $operationsClient;
 
@@ -171,7 +172,9 @@ public function getOperationsClient()
      */
     public function resumeOperation($operationName, $methodName = null)
     {
-        $options = isset($this->descriptors[$methodName]['longRunning']) ? $this->descriptors[$methodName]['longRunning'] : [];
+        $options = isset($this->descriptors[$methodName]['longRunning'])
+            ? $this->descriptors[$methodName]['longRunning']
+            : [];
         $operation = new OperationResponse($operationName, $this->getOperationsClient(), $options);
         $operation->reload();
         return $operation;
@@ -225,8 +228,13 @@ public static function locationName(string $project, string $location): string
      *
      * @return string The formatted resource resource.
      */
-    public static function resourceName(string $project, string $location, string $deployment, string $revision, string $resource): string
-    {
+    public static function resourceName(
+        string $project,
+        string $location,
+        string $deployment,
+        string $revision,
+        string $resource
+    ): string {
         return self::getPathTemplate('resource')->render([
             'project' => $project,
             'location' => $location,
@@ -491,8 +499,10 @@ public function deleteStatefile(DeleteStatefileRequest $request, array $callOpti
      *
      * @throws ApiException Thrown if the API call fails.
      */
-    public function exportDeploymentStatefile(ExportDeploymentStatefileRequest $request, array $callOptions = []): Statefile
-    {
+    public function exportDeploymentStatefile(
+        ExportDeploymentStatefileRequest $request,
+        array $callOptions = []
+    ): Statefile {
         return $this->startApiCall('ExportDeploymentStatefile', $request, $callOptions)->wait();
     }
 
@@ -947,8 +957,10 @@ public function setIamPolicy(SetIamPolicyRequest $request, array $callOptions =
      *
      * @throws ApiException Thrown if the API call fails.
      */
-    public function testIamPermissions(TestIamPermissionsRequest $request, array $callOptions = []): TestIamPermissionsResponse
-    {
+    public function testIamPermissions(
+        TestIamPermissionsRequest $request,
+        array $callOptions = []
+    ): TestIamPermissionsResponse {
         return $this->startApiCall('TestIamPermissions', $request, $callOptions)->wait();
     }
 }