diff --git a/grpc-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/SystemPolicyV1Beta1Grpc.java b/grpc-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/SystemPolicyV1Beta1Grpc.java
index cf64caca..3ae0b37b 100644
--- a/grpc-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/SystemPolicyV1Beta1Grpc.java
+++ b/grpc-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/SystemPolicyV1Beta1Grpc.java
@@ -27,6 +27,7 @@
 @javax.annotation.Generated(
     value = "by gRPC proto compiler",
     comments = "Source: google/cloud/binaryauthorization/v1beta1/service.proto")
+@io.grpc.stub.annotations.GrpcGenerated
 public final class SystemPolicyV1Beta1Grpc {
 
   private SystemPolicyV1Beta1Grpc() {}
diff --git a/proto-google-cloud-binary-authorization-v1/src/main/java/com/google/protos/google/cloud/binaryauthorization/v1/Resources.java b/proto-google-cloud-binary-authorization-v1/src/main/java/com/google/protos/google/cloud/binaryauthorization/v1/Resources.java
index f8a7c070..6277f6f6 100644
--- a/proto-google-cloud-binary-authorization-v1/src/main/java/com/google/protos/google/cloud/binaryauthorization/v1/Resources.java
+++ b/proto-google-cloud-binary-authorization-v1/src/main/java/com/google/protos/google/cloud/binaryauthorization/v1/Resources.java
@@ -282,9 +282,12 @@ public interface PolicyOrBuilder
      * map<string, .google.cloud.binaryauthorization.v1.AdmissionRule> cluster_admission_rules = 3 [(.google.api.field_behavior) = OPTIONAL];
      * </code>
      */
+
+    /* nullable */
     com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
         getClusterAdmissionRulesOrDefault(
             java.lang.String key,
+            /* nullable */
             com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
                 defaultValue);
     /**
@@ -367,9 +370,12 @@ public interface PolicyOrBuilder
      * map&lt;string, .google.cloud.binaryauthorization.v1.AdmissionRule&gt; kubernetes_namespace_admission_rules = 10 [(.google.api.field_behavior) = OPTIONAL];
      * </code>
      */
+
+    /* nullable */
     com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
         getKubernetesNamespaceAdmissionRulesOrDefault(
             java.lang.String key,
+            /* nullable */
             com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
                 defaultValue);
     /**
@@ -447,9 +453,12 @@ public interface PolicyOrBuilder
      * map&lt;string, .google.cloud.binaryauthorization.v1.AdmissionRule&gt; kubernetes_service_account_admission_rules = 8 [(.google.api.field_behavior) = OPTIONAL];
      * </code>
      */
+
+    /* nullable */
     com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
         getKubernetesServiceAccountAdmissionRulesOrDefault(
             java.lang.String key,
+            /* nullable */
             com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
                 defaultValue);
     /**
@@ -539,9 +548,12 @@ public interface PolicyOrBuilder
      * map&lt;string, .google.cloud.binaryauthorization.v1.AdmissionRule&gt; istio_service_identity_admission_rules = 9 [(.google.api.field_behavior) = OPTIONAL];
      * </code>
      */
+
+    /* nullable */
     com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
         getIstioServiceIdentityAdmissionRulesOrDefault(
             java.lang.String key,
+            /* nullable */
             com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
                 defaultValue);
     /**
@@ -881,6 +893,8 @@ private Policy(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -1396,7 +1410,7 @@ public int getClusterAdmissionRulesCount() {
     @java.lang.Override
     public boolean containsClusterAdmissionRules(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       return internalGetClusterAdmissionRules().getMap().containsKey(key);
     }
@@ -1457,7 +1471,7 @@ public boolean containsClusterAdmissionRules(java.lang.String key) {
             com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
                 defaultValue) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map<
               java.lang.String,
@@ -1486,7 +1500,7 @@ public boolean containsClusterAdmissionRules(java.lang.String key) {
     public com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
         getClusterAdmissionRulesOrThrow(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map<
               java.lang.String,
@@ -1552,7 +1566,7 @@ public int getKubernetesNamespaceAdmissionRulesCount() {
     @java.lang.Override
     public boolean containsKubernetesNamespaceAdmissionRules(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       return internalGetKubernetesNamespaceAdmissionRules().getMap().containsKey(key);
     }
@@ -1603,7 +1617,7 @@ public boolean containsKubernetesNamespaceAdmissionRules(java.lang.String key) {
             com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
                 defaultValue) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map<
               java.lang.String,
@@ -1627,7 +1641,7 @@ public boolean containsKubernetesNamespaceAdmissionRules(java.lang.String key) {
     public com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
         getKubernetesNamespaceAdmissionRulesOrThrow(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map<
               java.lang.String,
@@ -1693,7 +1707,7 @@ public int getKubernetesServiceAccountAdmissionRulesCount() {
     @java.lang.Override
     public boolean containsKubernetesServiceAccountAdmissionRules(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       return internalGetKubernetesServiceAccountAdmissionRules().getMap().containsKey(key);
     }
@@ -1744,7 +1758,7 @@ public boolean containsKubernetesServiceAccountAdmissionRules(java.lang.String k
             com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
                 defaultValue) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map<
               java.lang.String,
@@ -1768,7 +1782,7 @@ public boolean containsKubernetesServiceAccountAdmissionRules(java.lang.String k
     public com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
         getKubernetesServiceAccountAdmissionRulesOrThrow(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map<
               java.lang.String,
@@ -1837,7 +1851,7 @@ public int getIstioServiceIdentityAdmissionRulesCount() {
     @java.lang.Override
     public boolean containsIstioServiceIdentityAdmissionRules(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       return internalGetIstioServiceIdentityAdmissionRules().getMap().containsKey(key);
     }
@@ -1894,7 +1908,7 @@ public boolean containsIstioServiceIdentityAdmissionRules(java.lang.String key)
             com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
                 defaultValue) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map<
               java.lang.String,
@@ -1921,7 +1935,7 @@ public boolean containsIstioServiceIdentityAdmissionRules(java.lang.String key)
     public com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
         getIstioServiceIdentityAdmissionRulesOrThrow(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map<
               java.lang.String,
@@ -3586,7 +3600,7 @@ public int getClusterAdmissionRulesCount() {
       @java.lang.Override
       public boolean containsClusterAdmissionRules(java.lang.String key) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         return internalGetClusterAdmissionRules().getMap().containsKey(key);
       }
@@ -3647,7 +3661,7 @@ public boolean containsClusterAdmissionRules(java.lang.String key) {
               com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
                   defaultValue) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         java.util.Map<
                 java.lang.String,
@@ -3676,7 +3690,7 @@ public boolean containsClusterAdmissionRules(java.lang.String key) {
       public com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
           getClusterAdmissionRulesOrThrow(java.lang.String key) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         java.util.Map<
                 java.lang.String,
@@ -3711,7 +3725,7 @@ public Builder clearClusterAdmissionRules() {
        */
       public Builder removeClusterAdmissionRules(java.lang.String key) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         internalGetMutableClusterAdmissionRules().getMutableMap().remove(key);
         return this;
@@ -3745,11 +3759,12 @@ public Builder putClusterAdmissionRules(
           java.lang.String key,
           com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule value) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         if (value == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map value");
         }
+
         internalGetMutableClusterAdmissionRules().getMutableMap().put(key, value);
         return this;
       }
@@ -3830,7 +3845,7 @@ public int getKubernetesNamespaceAdmissionRulesCount() {
       @java.lang.Override
       public boolean containsKubernetesNamespaceAdmissionRules(java.lang.String key) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         return internalGetKubernetesNamespaceAdmissionRules().getMap().containsKey(key);
       }
@@ -3881,7 +3896,7 @@ public boolean containsKubernetesNamespaceAdmissionRules(java.lang.String key) {
               com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
                   defaultValue) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         java.util.Map<
                 java.lang.String,
@@ -3905,7 +3920,7 @@ public boolean containsKubernetesNamespaceAdmissionRules(java.lang.String key) {
       public com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
           getKubernetesNamespaceAdmissionRulesOrThrow(java.lang.String key) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         java.util.Map<
                 java.lang.String,
@@ -3935,7 +3950,7 @@ public Builder clearKubernetesNamespaceAdmissionRules() {
        */
       public Builder removeKubernetesNamespaceAdmissionRules(java.lang.String key) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         internalGetMutableKubernetesNamespaceAdmissionRules().getMutableMap().remove(key);
         return this;
@@ -3964,11 +3979,12 @@ public Builder putKubernetesNamespaceAdmissionRules(
           java.lang.String key,
           com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule value) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         if (value == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map value");
         }
+
         internalGetMutableKubernetesNamespaceAdmissionRules().getMutableMap().put(key, value);
         return this;
       }
@@ -4044,7 +4060,7 @@ public int getKubernetesServiceAccountAdmissionRulesCount() {
       @java.lang.Override
       public boolean containsKubernetesServiceAccountAdmissionRules(java.lang.String key) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         return internalGetKubernetesServiceAccountAdmissionRules().getMap().containsKey(key);
       }
@@ -4095,7 +4111,7 @@ public boolean containsKubernetesServiceAccountAdmissionRules(java.lang.String k
               com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
                   defaultValue) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         java.util.Map<
                 java.lang.String,
@@ -4119,7 +4135,7 @@ public boolean containsKubernetesServiceAccountAdmissionRules(java.lang.String k
       public com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
           getKubernetesServiceAccountAdmissionRulesOrThrow(java.lang.String key) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         java.util.Map<
                 java.lang.String,
@@ -4149,7 +4165,7 @@ public Builder clearKubernetesServiceAccountAdmissionRules() {
        */
       public Builder removeKubernetesServiceAccountAdmissionRules(java.lang.String key) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         internalGetMutableKubernetesServiceAccountAdmissionRules().getMutableMap().remove(key);
         return this;
@@ -4178,11 +4194,12 @@ public Builder putKubernetesServiceAccountAdmissionRules(
           java.lang.String key,
           com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule value) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         if (value == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map value");
         }
+
         internalGetMutableKubernetesServiceAccountAdmissionRules().getMutableMap().put(key, value);
         return this;
       }
@@ -4261,7 +4278,7 @@ public int getIstioServiceIdentityAdmissionRulesCount() {
       @java.lang.Override
       public boolean containsIstioServiceIdentityAdmissionRules(java.lang.String key) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         return internalGetIstioServiceIdentityAdmissionRules().getMap().containsKey(key);
       }
@@ -4318,7 +4335,7 @@ public boolean containsIstioServiceIdentityAdmissionRules(java.lang.String key)
               com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
                   defaultValue) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         java.util.Map<
                 java.lang.String,
@@ -4345,7 +4362,7 @@ public boolean containsIstioServiceIdentityAdmissionRules(java.lang.String key)
       public com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule
           getIstioServiceIdentityAdmissionRulesOrThrow(java.lang.String key) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         java.util.Map<
                 java.lang.String,
@@ -4378,7 +4395,7 @@ public Builder clearIstioServiceIdentityAdmissionRules() {
        */
       public Builder removeIstioServiceIdentityAdmissionRules(java.lang.String key) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         internalGetMutableIstioServiceIdentityAdmissionRules().getMutableMap().remove(key);
         return this;
@@ -4410,11 +4427,12 @@ public Builder putIstioServiceIdentityAdmissionRules(
           java.lang.String key,
           com.google.protos.google.cloud.binaryauthorization.v1.Resources.AdmissionRule value) {
         if (key == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map key");
         }
         if (value == null) {
-          throw new java.lang.NullPointerException();
+          throw new NullPointerException("map value");
         }
+
         internalGetMutableIstioServiceIdentityAdmissionRules().getMutableMap().put(key, value);
         return this;
       }
@@ -5035,6 +5053,8 @@ private AdmissionWhitelistPattern(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -5909,6 +5929,8 @@ private AdmissionRule(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -7668,6 +7690,8 @@ private Attestor(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -8776,8 +8800,9 @@ public Builder mergeUserOwnedGrafeasNote(
         } else {
           if (attestorTypeCase_ == 3) {
             userOwnedGrafeasNoteBuilder_.mergeFrom(value);
+          } else {
+            userOwnedGrafeasNoteBuilder_.setMessage(value);
           }
-          userOwnedGrafeasNoteBuilder_.setMessage(value);
         }
         attestorTypeCase_ = 3;
         return this;
@@ -9439,6 +9464,8 @@ private UserOwnedGrafeasNote(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -11187,6 +11214,8 @@ private PkixPublicKey(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -12726,6 +12755,8 @@ private AttestorPublicKey(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -14085,8 +14116,9 @@ public Builder mergePkixPublicKey(
         } else {
           if (publicKeyCase_ == 5) {
             pkixPublicKeyBuilder_.mergeFrom(value);
+          } else {
+            pkixPublicKeyBuilder_.setMessage(value);
           }
-          pkixPublicKeyBuilder_.setMessage(value);
         }
         publicKeyCase_ = 5;
         return this;
diff --git a/proto-google-cloud-binary-authorization-v1/src/main/java/com/google/protos/google/cloud/binaryauthorization/v1/Service.java b/proto-google-cloud-binary-authorization-v1/src/main/java/com/google/protos/google/cloud/binaryauthorization/v1/Service.java
index 8856c97e..1037da0d 100644
--- a/proto-google-cloud-binary-authorization-v1/src/main/java/com/google/protos/google/cloud/binaryauthorization/v1/Service.java
+++ b/proto-google-cloud-binary-authorization-v1/src/main/java/com/google/protos/google/cloud/binaryauthorization/v1/Service.java
@@ -133,6 +133,8 @@ private GetPolicyRequest(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -871,6 +873,8 @@ private UpdatePolicyRequest(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -1810,6 +1814,8 @@ private CreateAttestorRequest(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -3023,6 +3029,8 @@ private GetAttestorRequest(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -3763,6 +3771,8 @@ private UpdateAttestorRequest(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -4676,6 +4686,8 @@ private ListAttestorsRequest(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -5738,6 +5750,8 @@ private ListAttestorsResponse(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -6978,6 +6992,8 @@ private DeleteAttestorRequest(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -7706,6 +7722,8 @@ private GetSystemPolicyRequest(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -8574,6 +8592,8 @@ private ValidateAttestationOccurrenceRequest(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -10029,6 +10049,8 @@ private ValidateAttestationOccurrenceResponse(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/AdmissionRule.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/AdmissionRule.java
index b2f9c2ea..7457ce20 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/AdmissionRule.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/AdmissionRule.java
@@ -113,6 +113,8 @@ private AdmissionRule(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/AdmissionWhitelistPattern.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/AdmissionWhitelistPattern.java
index 7e524017..bf7fe22e 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/AdmissionWhitelistPattern.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/AdmissionWhitelistPattern.java
@@ -89,6 +89,8 @@ private AdmissionWhitelistPattern(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/Attestor.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/Attestor.java
index d85e7c13..3bd13346 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/Attestor.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/Attestor.java
@@ -136,6 +136,8 @@ private Attestor(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -1190,8 +1192,9 @@ public Builder mergeUserOwnedDrydockNote(
       } else {
         if (attestorTypeCase_ == 3) {
           userOwnedDrydockNoteBuilder_.mergeFrom(value);
+        } else {
+          userOwnedDrydockNoteBuilder_.setMessage(value);
         }
-        userOwnedDrydockNoteBuilder_.setMessage(value);
       }
       attestorTypeCase_ = 3;
       return this;
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/AttestorPublicKey.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/AttestorPublicKey.java
index 0c9b1afa..005f7715 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/AttestorPublicKey.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/AttestorPublicKey.java
@@ -124,6 +124,8 @@ private AttestorPublicKey(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -1436,8 +1438,9 @@ public Builder mergePkixPublicKey(
       } else {
         if (publicKeyCase_ == 5) {
           pkixPublicKeyBuilder_.mergeFrom(value);
+        } else {
+          pkixPublicKeyBuilder_.setMessage(value);
         }
-        pkixPublicKeyBuilder_.setMessage(value);
       }
       publicKeyCase_ = 5;
       return this;
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ContinuousValidationEvent.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ContinuousValidationEvent.java
index 72679d3f..e3511994 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ContinuousValidationEvent.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ContinuousValidationEvent.java
@@ -133,6 +133,8 @@ private ContinuousValidationEvent(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -488,6 +490,8 @@ private ContinuousValidationPodEvent(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -831,6 +835,8 @@ private ImageDetails(
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           throw e.setUnfinishedMessage(this);
+        } catch (com.google.protobuf.UninitializedMessageException e) {
+          throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
           throw new com.google.protobuf.InvalidProtocolBufferException(e)
               .setUnfinishedMessage(this);
@@ -3959,6 +3965,8 @@ private UnsupportedPolicyEvent(
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
       } finally {
@@ -5316,8 +5324,9 @@ public Builder mergePodEvent(
       } else {
         if (eventTypeCase_ == 1) {
           podEventBuilder_.mergeFrom(value);
+        } else {
+          podEventBuilder_.setMessage(value);
         }
-        podEventBuilder_.setMessage(value);
       }
       eventTypeCase_ = 1;
       return this;
@@ -5582,8 +5591,9 @@ public Builder mergeUnsupportedPolicyEvent(
       } else {
         if (eventTypeCase_ == 2) {
           unsupportedPolicyEventBuilder_.mergeFrom(value);
+        } else {
+          unsupportedPolicyEventBuilder_.setMessage(value);
         }
-        unsupportedPolicyEventBuilder_.setMessage(value);
       }
       eventTypeCase_ = 2;
       return this;
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/CreateAttestorRequest.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/CreateAttestorRequest.java
index 667e91b7..7f1414ce 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/CreateAttestorRequest.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/CreateAttestorRequest.java
@@ -113,6 +113,8 @@ private CreateAttestorRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/DeleteAttestorRequest.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/DeleteAttestorRequest.java
index 3b748ac3..36c5c611 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/DeleteAttestorRequest.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/DeleteAttestorRequest.java
@@ -88,6 +88,8 @@ private DeleteAttestorRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/GetAttestorRequest.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/GetAttestorRequest.java
index e6e28dc2..a7858093 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/GetAttestorRequest.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/GetAttestorRequest.java
@@ -88,6 +88,8 @@ private GetAttestorRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/GetPolicyRequest.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/GetPolicyRequest.java
index 60a9c334..96103149 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/GetPolicyRequest.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/GetPolicyRequest.java
@@ -88,6 +88,8 @@ private GetPolicyRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/GetSystemPolicyRequest.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/GetSystemPolicyRequest.java
index fbc4c75c..3b8825f4 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/GetSystemPolicyRequest.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/GetSystemPolicyRequest.java
@@ -88,6 +88,8 @@ private GetSystemPolicyRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ListAttestorsRequest.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ListAttestorsRequest.java
index cb82b587..3202f69b 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ListAttestorsRequest.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ListAttestorsRequest.java
@@ -101,6 +101,8 @@ private ListAttestorsRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ListAttestorsResponse.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ListAttestorsResponse.java
index 1e599720..ede964d3 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ListAttestorsResponse.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ListAttestorsResponse.java
@@ -104,6 +104,8 @@ private ListAttestorsResponse(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/PkixPublicKey.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/PkixPublicKey.java
index b9b86a57..39a019d1 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/PkixPublicKey.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/PkixPublicKey.java
@@ -99,6 +99,8 @@ private PkixPublicKey(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/Policy.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/Policy.java
index 8db61519..90d7a396 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/Policy.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/Policy.java
@@ -238,6 +238,8 @@ private Policy(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
@@ -740,7 +742,7 @@ public int getClusterAdmissionRulesCount() {
   @java.lang.Override
   public boolean containsClusterAdmissionRules(java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     return internalGetClusterAdmissionRules().getMap().containsKey(key);
   }
@@ -796,7 +798,7 @@ public boolean containsClusterAdmissionRules(java.lang.String key) {
           java.lang.String key,
           com.google.cloud.binaryauthorization.v1beta1.AdmissionRule defaultValue) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map<java.lang.String, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule>
         map = internalGetClusterAdmissionRules().getMap();
@@ -823,7 +825,7 @@ public boolean containsClusterAdmissionRules(java.lang.String key) {
   public com.google.cloud.binaryauthorization.v1beta1.AdmissionRule getClusterAdmissionRulesOrThrow(
       java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map<java.lang.String, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule>
         map = internalGetClusterAdmissionRules().getMap();
@@ -884,7 +886,7 @@ public int getKubernetesNamespaceAdmissionRulesCount() {
   @java.lang.Override
   public boolean containsKubernetesNamespaceAdmissionRules(java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     return internalGetKubernetesNamespaceAdmissionRules().getMap().containsKey(key);
   }
@@ -930,7 +932,7 @@ public boolean containsKubernetesNamespaceAdmissionRules(java.lang.String key) {
           java.lang.String key,
           com.google.cloud.binaryauthorization.v1beta1.AdmissionRule defaultValue) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map<java.lang.String, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule>
         map = internalGetKubernetesNamespaceAdmissionRules().getMap();
@@ -952,7 +954,7 @@ public boolean containsKubernetesNamespaceAdmissionRules(java.lang.String key) {
   public com.google.cloud.binaryauthorization.v1beta1.AdmissionRule
       getKubernetesNamespaceAdmissionRulesOrThrow(java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map<java.lang.String, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule>
         map = internalGetKubernetesNamespaceAdmissionRules().getMap();
@@ -1013,7 +1015,7 @@ public int getKubernetesServiceAccountAdmissionRulesCount() {
   @java.lang.Override
   public boolean containsKubernetesServiceAccountAdmissionRules(java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     return internalGetKubernetesServiceAccountAdmissionRules().getMap().containsKey(key);
   }
@@ -1059,7 +1061,7 @@ public boolean containsKubernetesServiceAccountAdmissionRules(java.lang.String k
           java.lang.String key,
           com.google.cloud.binaryauthorization.v1beta1.AdmissionRule defaultValue) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map<java.lang.String, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule>
         map = internalGetKubernetesServiceAccountAdmissionRules().getMap();
@@ -1081,7 +1083,7 @@ public boolean containsKubernetesServiceAccountAdmissionRules(java.lang.String k
   public com.google.cloud.binaryauthorization.v1beta1.AdmissionRule
       getKubernetesServiceAccountAdmissionRulesOrThrow(java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map<java.lang.String, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule>
         map = internalGetKubernetesServiceAccountAdmissionRules().getMap();
@@ -1145,7 +1147,7 @@ public int getIstioServiceIdentityAdmissionRulesCount() {
   @java.lang.Override
   public boolean containsIstioServiceIdentityAdmissionRules(java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     return internalGetIstioServiceIdentityAdmissionRules().getMap().containsKey(key);
   }
@@ -1197,7 +1199,7 @@ public boolean containsIstioServiceIdentityAdmissionRules(java.lang.String key)
           java.lang.String key,
           com.google.cloud.binaryauthorization.v1beta1.AdmissionRule defaultValue) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map<java.lang.String, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule>
         map = internalGetIstioServiceIdentityAdmissionRules().getMap();
@@ -1222,7 +1224,7 @@ public boolean containsIstioServiceIdentityAdmissionRules(java.lang.String key)
   public com.google.cloud.binaryauthorization.v1beta1.AdmissionRule
       getIstioServiceIdentityAdmissionRulesOrThrow(java.lang.String key) {
     if (key == null) {
-      throw new java.lang.NullPointerException();
+      throw new NullPointerException("map key");
     }
     java.util.Map<java.lang.String, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule>
         map = internalGetIstioServiceIdentityAdmissionRules().getMap();
@@ -2811,7 +2813,7 @@ public int getClusterAdmissionRulesCount() {
     @java.lang.Override
     public boolean containsClusterAdmissionRules(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       return internalGetClusterAdmissionRules().getMap().containsKey(key);
     }
@@ -2869,7 +2871,7 @@ public boolean containsClusterAdmissionRules(java.lang.String key) {
             java.lang.String key,
             com.google.cloud.binaryauthorization.v1beta1.AdmissionRule defaultValue) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map<java.lang.String, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule>
           map = internalGetClusterAdmissionRules().getMap();
@@ -2896,7 +2898,7 @@ public boolean containsClusterAdmissionRules(java.lang.String key) {
     public com.google.cloud.binaryauthorization.v1beta1.AdmissionRule
         getClusterAdmissionRulesOrThrow(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map<java.lang.String, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule>
           map = internalGetClusterAdmissionRules().getMap();
@@ -2929,7 +2931,7 @@ public Builder clearClusterAdmissionRules() {
      */
     public Builder removeClusterAdmissionRules(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       internalGetMutableClusterAdmissionRules().getMutableMap().remove(key);
       return this;
@@ -2961,11 +2963,12 @@ public Builder removeClusterAdmissionRules(java.lang.String key) {
     public Builder putClusterAdmissionRules(
         java.lang.String key, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule value) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       if (value == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map value");
       }
+
       internalGetMutableClusterAdmissionRules().getMutableMap().put(key, value);
       return this;
     }
@@ -3041,7 +3044,7 @@ public int getKubernetesNamespaceAdmissionRulesCount() {
     @java.lang.Override
     public boolean containsKubernetesNamespaceAdmissionRules(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       return internalGetKubernetesNamespaceAdmissionRules().getMap().containsKey(key);
     }
@@ -3089,7 +3092,7 @@ public boolean containsKubernetesNamespaceAdmissionRules(java.lang.String key) {
             java.lang.String key,
             com.google.cloud.binaryauthorization.v1beta1.AdmissionRule defaultValue) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map<java.lang.String, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule>
           map = internalGetKubernetesNamespaceAdmissionRules().getMap();
@@ -3111,7 +3114,7 @@ public boolean containsKubernetesNamespaceAdmissionRules(java.lang.String key) {
     public com.google.cloud.binaryauthorization.v1beta1.AdmissionRule
         getKubernetesNamespaceAdmissionRulesOrThrow(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map<java.lang.String, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule>
           map = internalGetKubernetesNamespaceAdmissionRules().getMap();
@@ -3139,7 +3142,7 @@ public Builder clearKubernetesNamespaceAdmissionRules() {
      */
     public Builder removeKubernetesNamespaceAdmissionRules(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       internalGetMutableKubernetesNamespaceAdmissionRules().getMutableMap().remove(key);
       return this;
@@ -3166,11 +3169,12 @@ public Builder removeKubernetesNamespaceAdmissionRules(java.lang.String key) {
     public Builder putKubernetesNamespaceAdmissionRules(
         java.lang.String key, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule value) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       if (value == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map value");
       }
+
       internalGetMutableKubernetesNamespaceAdmissionRules().getMutableMap().put(key, value);
       return this;
     }
@@ -3241,7 +3245,7 @@ public int getKubernetesServiceAccountAdmissionRulesCount() {
     @java.lang.Override
     public boolean containsKubernetesServiceAccountAdmissionRules(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       return internalGetKubernetesServiceAccountAdmissionRules().getMap().containsKey(key);
     }
@@ -3289,7 +3293,7 @@ public boolean containsKubernetesServiceAccountAdmissionRules(java.lang.String k
             java.lang.String key,
             com.google.cloud.binaryauthorization.v1beta1.AdmissionRule defaultValue) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map<java.lang.String, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule>
           map = internalGetKubernetesServiceAccountAdmissionRules().getMap();
@@ -3311,7 +3315,7 @@ public boolean containsKubernetesServiceAccountAdmissionRules(java.lang.String k
     public com.google.cloud.binaryauthorization.v1beta1.AdmissionRule
         getKubernetesServiceAccountAdmissionRulesOrThrow(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map<java.lang.String, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule>
           map = internalGetKubernetesServiceAccountAdmissionRules().getMap();
@@ -3339,7 +3343,7 @@ public Builder clearKubernetesServiceAccountAdmissionRules() {
      */
     public Builder removeKubernetesServiceAccountAdmissionRules(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       internalGetMutableKubernetesServiceAccountAdmissionRules().getMutableMap().remove(key);
       return this;
@@ -3366,11 +3370,12 @@ public Builder removeKubernetesServiceAccountAdmissionRules(java.lang.String key
     public Builder putKubernetesServiceAccountAdmissionRules(
         java.lang.String key, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule value) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       if (value == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map value");
       }
+
       internalGetMutableKubernetesServiceAccountAdmissionRules().getMutableMap().put(key, value);
       return this;
     }
@@ -3444,7 +3449,7 @@ public int getIstioServiceIdentityAdmissionRulesCount() {
     @java.lang.Override
     public boolean containsIstioServiceIdentityAdmissionRules(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       return internalGetIstioServiceIdentityAdmissionRules().getMap().containsKey(key);
     }
@@ -3498,7 +3503,7 @@ public boolean containsIstioServiceIdentityAdmissionRules(java.lang.String key)
             java.lang.String key,
             com.google.cloud.binaryauthorization.v1beta1.AdmissionRule defaultValue) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map<java.lang.String, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule>
           map = internalGetIstioServiceIdentityAdmissionRules().getMap();
@@ -3523,7 +3528,7 @@ public boolean containsIstioServiceIdentityAdmissionRules(java.lang.String key)
     public com.google.cloud.binaryauthorization.v1beta1.AdmissionRule
         getIstioServiceIdentityAdmissionRulesOrThrow(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       java.util.Map<java.lang.String, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule>
           map = internalGetIstioServiceIdentityAdmissionRules().getMap();
@@ -3554,7 +3559,7 @@ public Builder clearIstioServiceIdentityAdmissionRules() {
      */
     public Builder removeIstioServiceIdentityAdmissionRules(java.lang.String key) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       internalGetMutableIstioServiceIdentityAdmissionRules().getMutableMap().remove(key);
       return this;
@@ -3584,11 +3589,12 @@ public Builder removeIstioServiceIdentityAdmissionRules(java.lang.String key) {
     public Builder putIstioServiceIdentityAdmissionRules(
         java.lang.String key, com.google.cloud.binaryauthorization.v1beta1.AdmissionRule value) {
       if (key == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map key");
       }
       if (value == null) {
-        throw new java.lang.NullPointerException();
+        throw new NullPointerException("map value");
       }
+
       internalGetMutableIstioServiceIdentityAdmissionRules().getMutableMap().put(key, value);
       return this;
     }
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/PolicyOrBuilder.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/PolicyOrBuilder.java
index 39936150..80dd78c2 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/PolicyOrBuilder.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/PolicyOrBuilder.java
@@ -263,8 +263,11 @@ public interface PolicyOrBuilder
    * map&lt;string, .google.cloud.binaryauthorization.v1beta1.AdmissionRule&gt; cluster_admission_rules = 3 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
+
+  /* nullable */
   com.google.cloud.binaryauthorization.v1beta1.AdmissionRule getClusterAdmissionRulesOrDefault(
       java.lang.String key,
+      /* nullable */
       com.google.cloud.binaryauthorization.v1beta1.AdmissionRule defaultValue);
   /**
    *
@@ -342,9 +345,12 @@ com.google.cloud.binaryauthorization.v1beta1.AdmissionRule getClusterAdmissionRu
    * map&lt;string, .google.cloud.binaryauthorization.v1beta1.AdmissionRule&gt; kubernetes_namespace_admission_rules = 10 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
+
+  /* nullable */
   com.google.cloud.binaryauthorization.v1beta1.AdmissionRule
       getKubernetesNamespaceAdmissionRulesOrDefault(
           java.lang.String key,
+          /* nullable */
           com.google.cloud.binaryauthorization.v1beta1.AdmissionRule defaultValue);
   /**
    *
@@ -417,9 +423,12 @@ com.google.cloud.binaryauthorization.v1beta1.AdmissionRule getClusterAdmissionRu
    * map&lt;string, .google.cloud.binaryauthorization.v1beta1.AdmissionRule&gt; kubernetes_service_account_admission_rules = 8 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
+
+  /* nullable */
   com.google.cloud.binaryauthorization.v1beta1.AdmissionRule
       getKubernetesServiceAccountAdmissionRulesOrDefault(
           java.lang.String key,
+          /* nullable */
           com.google.cloud.binaryauthorization.v1beta1.AdmissionRule defaultValue);
   /**
    *
@@ -504,9 +513,12 @@ com.google.cloud.binaryauthorization.v1beta1.AdmissionRule getClusterAdmissionRu
    * map&lt;string, .google.cloud.binaryauthorization.v1beta1.AdmissionRule&gt; istio_service_identity_admission_rules = 9 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
+
+  /* nullable */
   com.google.cloud.binaryauthorization.v1beta1.AdmissionRule
       getIstioServiceIdentityAdmissionRulesOrDefault(
           java.lang.String key,
+          /* nullable */
           com.google.cloud.binaryauthorization.v1beta1.AdmissionRule defaultValue);
   /**
    *
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/UpdateAttestorRequest.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/UpdateAttestorRequest.java
index 58679c21..30e70531 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/UpdateAttestorRequest.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/UpdateAttestorRequest.java
@@ -96,6 +96,8 @@ private UpdateAttestorRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/UpdatePolicyRequest.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/UpdatePolicyRequest.java
index 1a948a5b..5fdcdacf 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/UpdatePolicyRequest.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/UpdatePolicyRequest.java
@@ -96,6 +96,8 @@ private UpdatePolicyRequest(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {
diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/UserOwnedDrydockNote.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/UserOwnedDrydockNote.java
index dd2db543..83aea8f7 100644
--- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/UserOwnedDrydockNote.java
+++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/UserOwnedDrydockNote.java
@@ -113,6 +113,8 @@ private UserOwnedDrydockNote(
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
+    } catch (com.google.protobuf.UninitializedMessageException e) {
+      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
       throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
     } finally {