diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/BaseBigQueryReadClientTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/BaseBigQueryReadClientTest.java
index f4448dcbb7..9116265c5e 100644
--- a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/BaseBigQueryReadClientTest.java
+++ b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/BaseBigQueryReadClientTest.java
@@ -47,8 +47,8 @@
 public class BaseBigQueryReadClientTest {
   private static MockBigQueryRead mockBigQueryRead;
   private static MockServiceHelper mockServiceHelper;
-  private BaseBigQueryReadClient client;
   private LocalChannelProvider channelProvider;
+  private BaseBigQueryReadClient client;
 
   @BeforeClass
   public static void startStaticServer() {
diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/BaseBigQueryStorageClientTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/BaseBigQueryStorageClientTest.java
index 90b350d63b..fc7851aad9 100644
--- a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/BaseBigQueryStorageClientTest.java
+++ b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/BaseBigQueryStorageClientTest.java
@@ -48,8 +48,8 @@
 public class BaseBigQueryStorageClientTest {
   private static MockBigQueryStorage mockBigQueryStorage;
   private static MockServiceHelper mockServiceHelper;
-  private BaseBigQueryStorageClient client;
   private LocalChannelProvider channelProvider;
+  private BaseBigQueryStorageClient client;
 
   @BeforeClass
   public static void startStaticServer() {
diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/BaseBigQueryReadClientTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/BaseBigQueryReadClientTest.java
index 2121b7693e..b6266bdc5f 100644
--- a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/BaseBigQueryReadClientTest.java
+++ b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/BaseBigQueryReadClientTest.java
@@ -47,8 +47,8 @@
 public class BaseBigQueryReadClientTest {
   private static MockBigQueryRead mockBigQueryRead;
   private static MockServiceHelper mockServiceHelper;
-  private BaseBigQueryReadClient client;
   private LocalChannelProvider channelProvider;
+  private BaseBigQueryReadClient client;
 
   @BeforeClass
   public static void startStaticServer() {
diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/BigQueryWriteClientTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/BigQueryWriteClientTest.java
index dcc97b495b..f44bbb94ae 100644
--- a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/BigQueryWriteClientTest.java
+++ b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/BigQueryWriteClientTest.java
@@ -49,8 +49,8 @@
 public class BigQueryWriteClientTest {
   private static MockBigQueryWrite mockBigQueryWrite;
   private static MockServiceHelper mockServiceHelper;
-  private BigQueryWriteClient client;
   private LocalChannelProvider channelProvider;
+  private BigQueryWriteClient client;
 
   @BeforeClass
   public static void startStaticServer() {
diff --git a/synth.metadata b/synth.metadata
index d2e3c86c11..5e7be971c4 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,31 +11,31 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-bigquerystorage.git",
-        "sha": "f11956f4b790ba4c6d42eb5ed4e27691f5ebb0e7"
+        "sha": "380195b51368b88f25dba20499de5f8053f13984"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "a5f96d06ef57e325761bad010f460d0c5dbeccda",
-        "internalRef": "377081269"
+        "sha": "9e3105549a35520f215359065c11e8dce15e18af",
+        "internalRef": "378266372"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "a5f96d06ef57e325761bad010f460d0c5dbeccda",
-        "internalRef": "377081269"
+        "sha": "9e3105549a35520f215359065c11e8dce15e18af",
+        "internalRef": "378266372"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "a5f96d06ef57e325761bad010f460d0c5dbeccda",
-        "internalRef": "377081269"
+        "sha": "9e3105549a35520f215359065c11e8dce15e18af",
+        "internalRef": "378266372"
       }
     },
     {